<!DOCTYPE html>
<html lang="en-US">
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width,initial-scale=1">
    <title>Git 使用规范 | JavaKeeper</title>
    <meta name="generator" content="VuePress 1.5.4">
    <link rel="icon" href="/icon.svg">
    <script>
        var _hmt = _hmt || [];
        (function() {
            var hm = document.createElement("script");
            hm.src = "https://hm.baidu.com/hm.js?a949a9b30eb86ac0159e735ff8670c03";
            var s = document.getElementsByTagName("script")[0];
            s.parentNode.insertBefore(hm, s);
            // 引入谷歌,不需要可删除这段
            var hm1 = document.createElement("script");
            hm1.src = "https://www.googletagmanager.com/gtag/js?id=UA-169923503-1";
            var s1 = document.getElementsByTagName("script")[0]; 
            s1.parentNode.insertBefore(hm1, s1);
        })();
        // 谷歌加载,不需要可删除
        window.dataLayer = window.dataLayer || [];
        function gtag(){dataLayer.push(arguments);}
        gtag('js', new Date());
        gtag('config', 'UA-169923503-1');
    </script>
    <meta name="description" content="">
    <meta name="keywords" content="JavaKeeper,Java,Java开发,算法,blog">
    <link rel="preload" href="/assets/css/0.styles.91f57736.css" as="style"><link rel="preload" href="/assets/js/app.447d4224.js" as="script"><link rel="preload" href="/assets/js/3.9d76740c.js" as="script"><link rel="preload" href="/assets/js/1.c4fd7d2e.js" as="script"><link rel="preload" href="/assets/js/188.8dfc358f.js" as="script"><link rel="prefetch" href="/assets/js/10.8cf3be2c.js"><link rel="prefetch" href="/assets/js/100.74f35ab8.js"><link rel="prefetch" href="/assets/js/101.7a062346.js"><link rel="prefetch" href="/assets/js/102.c9485235.js"><link rel="prefetch" href="/assets/js/103.d88a3805.js"><link rel="prefetch" href="/assets/js/104.6e034144.js"><link rel="prefetch" href="/assets/js/105.d22f7450.js"><link rel="prefetch" href="/assets/js/106.a6cb54b0.js"><link rel="prefetch" href="/assets/js/107.7b65e72b.js"><link rel="prefetch" href="/assets/js/108.eb5804bb.js"><link rel="prefetch" href="/assets/js/109.05f775e5.js"><link rel="prefetch" href="/assets/js/11.c54ae13c.js"><link rel="prefetch" href="/assets/js/110.51d3d641.js"><link rel="prefetch" href="/assets/js/111.022b64a7.js"><link rel="prefetch" href="/assets/js/112.da8afd52.js"><link rel="prefetch" href="/assets/js/113.05a17b18.js"><link rel="prefetch" href="/assets/js/114.8960d913.js"><link rel="prefetch" href="/assets/js/115.67919f68.js"><link rel="prefetch" href="/assets/js/116.62b0cd71.js"><link rel="prefetch" href="/assets/js/117.ebac3eff.js"><link rel="prefetch" href="/assets/js/118.ecd629bd.js"><link rel="prefetch" href="/assets/js/119.a09a0897.js"><link rel="prefetch" href="/assets/js/12.60aa3b24.js"><link rel="prefetch" href="/assets/js/120.bf639d3d.js"><link rel="prefetch" href="/assets/js/121.b89d0c8e.js"><link rel="prefetch" href="/assets/js/122.1a75ff83.js"><link rel="prefetch" href="/assets/js/123.d2127132.js"><link rel="prefetch" href="/assets/js/124.2caff9e0.js"><link rel="prefetch" href="/assets/js/125.9b9f966a.js"><link rel="prefetch" href="/assets/js/126.58cdfb3d.js"><link rel="prefetch" href="/assets/js/127.8ef09c53.js"><link rel="prefetch" href="/assets/js/128.efdc2ae4.js"><link rel="prefetch" href="/assets/js/129.e35cbc57.js"><link rel="prefetch" href="/assets/js/13.125c13a0.js"><link rel="prefetch" href="/assets/js/130.f01a55e3.js"><link rel="prefetch" href="/assets/js/131.65205f4a.js"><link rel="prefetch" href="/assets/js/132.f42c5a0a.js"><link rel="prefetch" href="/assets/js/133.9ba468b3.js"><link rel="prefetch" href="/assets/js/134.7b597ba9.js"><link rel="prefetch" href="/assets/js/135.fb828b9a.js"><link rel="prefetch" href="/assets/js/136.3887532f.js"><link rel="prefetch" href="/assets/js/137.549bae01.js"><link rel="prefetch" href="/assets/js/138.db8d423d.js"><link rel="prefetch" href="/assets/js/139.dbaf2267.js"><link rel="prefetch" href="/assets/js/14.bd1d0b0d.js"><link rel="prefetch" href="/assets/js/140.6cb65fdc.js"><link rel="prefetch" href="/assets/js/141.9bd6cc4b.js"><link rel="prefetch" href="/assets/js/142.552db5ed.js"><link rel="prefetch" href="/assets/js/143.2c9f2bf4.js"><link rel="prefetch" href="/assets/js/144.fba98a15.js"><link rel="prefetch" href="/assets/js/145.c42f3a21.js"><link rel="prefetch" href="/assets/js/146.596d4d33.js"><link rel="prefetch" href="/assets/js/147.c48ae5c1.js"><link rel="prefetch" href="/assets/js/148.71064871.js"><link rel="prefetch" href="/assets/js/149.16582d21.js"><link rel="prefetch" href="/assets/js/15.f247873b.js"><link rel="prefetch" href="/assets/js/150.ead09aca.js"><link rel="prefetch" href="/assets/js/151.971fdf4b.js"><link rel="prefetch" href="/assets/js/152.369c9362.js"><link rel="prefetch" href="/assets/js/153.371edd15.js"><link rel="prefetch" href="/assets/js/154.e090b491.js"><link rel="prefetch" href="/assets/js/155.c68bf602.js"><link rel="prefetch" href="/assets/js/156.304aea8d.js"><link rel="prefetch" href="/assets/js/157.83beef7f.js"><link rel="prefetch" href="/assets/js/158.bb1794b0.js"><link rel="prefetch" href="/assets/js/159.2d54e792.js"><link rel="prefetch" href="/assets/js/16.04336c71.js"><link rel="prefetch" href="/assets/js/160.99d56586.js"><link rel="prefetch" href="/assets/js/161.edf660aa.js"><link rel="prefetch" href="/assets/js/162.0b84606e.js"><link rel="prefetch" href="/assets/js/163.b59e0d60.js"><link rel="prefetch" href="/assets/js/164.d9eb8228.js"><link rel="prefetch" href="/assets/js/165.ca624c79.js"><link rel="prefetch" href="/assets/js/166.025b2ba1.js"><link rel="prefetch" href="/assets/js/167.abc982cc.js"><link rel="prefetch" href="/assets/js/168.27ca13dc.js"><link rel="prefetch" href="/assets/js/169.41e753a2.js"><link rel="prefetch" href="/assets/js/17.43b3c1c8.js"><link rel="prefetch" href="/assets/js/170.626319e1.js"><link rel="prefetch" href="/assets/js/171.a221dddf.js"><link rel="prefetch" href="/assets/js/172.464b2361.js"><link rel="prefetch" href="/assets/js/173.96a3afee.js"><link rel="prefetch" href="/assets/js/174.116607c2.js"><link rel="prefetch" href="/assets/js/175.ea3e8659.js"><link rel="prefetch" href="/assets/js/176.7d7b8afc.js"><link rel="prefetch" href="/assets/js/177.a6e00aa0.js"><link rel="prefetch" href="/assets/js/178.1f93afaf.js"><link rel="prefetch" href="/assets/js/179.3aa00dcd.js"><link rel="prefetch" href="/assets/js/18.d81b44d5.js"><link rel="prefetch" href="/assets/js/180.f8b2b75a.js"><link rel="prefetch" href="/assets/js/181.8e11258a.js"><link rel="prefetch" href="/assets/js/182.22243941.js"><link rel="prefetch" href="/assets/js/183.d051fdf6.js"><link rel="prefetch" href="/assets/js/184.a994075e.js"><link rel="prefetch" href="/assets/js/185.776c7e16.js"><link rel="prefetch" href="/assets/js/186.f1887955.js"><link rel="prefetch" href="/assets/js/187.da0d3626.js"><link rel="prefetch" href="/assets/js/189.dcac5a59.js"><link rel="prefetch" href="/assets/js/19.1b3d66e1.js"><link rel="prefetch" href="/assets/js/190.c7e413d0.js"><link rel="prefetch" href="/assets/js/191.d9806121.js"><link rel="prefetch" href="/assets/js/192.869791da.js"><link rel="prefetch" href="/assets/js/193.2d74c4c8.js"><link rel="prefetch" href="/assets/js/194.c73a1909.js"><link rel="prefetch" href="/assets/js/195.e8c74834.js"><link rel="prefetch" href="/assets/js/20.bd5949ec.js"><link rel="prefetch" href="/assets/js/21.3fcf98cf.js"><link rel="prefetch" href="/assets/js/22.2fa1e2e8.js"><link rel="prefetch" href="/assets/js/23.1ae64bb4.js"><link rel="prefetch" href="/assets/js/24.7bdf7387.js"><link rel="prefetch" href="/assets/js/25.392c436e.js"><link rel="prefetch" href="/assets/js/26.58acbd4b.js"><link rel="prefetch" href="/assets/js/27.c725bdd5.js"><link rel="prefetch" href="/assets/js/28.6c9bda1e.js"><link rel="prefetch" href="/assets/js/29.e656b537.js"><link rel="prefetch" href="/assets/js/30.2c326fc7.js"><link rel="prefetch" href="/assets/js/31.e6c9fa30.js"><link rel="prefetch" href="/assets/js/32.c9c88437.js"><link rel="prefetch" href="/assets/js/33.0c53373c.js"><link rel="prefetch" href="/assets/js/34.9821e543.js"><link rel="prefetch" href="/assets/js/35.de8253eb.js"><link rel="prefetch" href="/assets/js/36.d182f929.js"><link rel="prefetch" href="/assets/js/37.9fa79014.js"><link rel="prefetch" href="/assets/js/38.9bebff76.js"><link rel="prefetch" href="/assets/js/39.19a3a2d4.js"><link rel="prefetch" href="/assets/js/4.564edb9d.js"><link rel="prefetch" href="/assets/js/40.cca6955f.js"><link rel="prefetch" href="/assets/js/41.854cd09a.js"><link rel="prefetch" href="/assets/js/42.ca7b612f.js"><link rel="prefetch" href="/assets/js/43.87027d58.js"><link rel="prefetch" href="/assets/js/44.8c2b4f4b.js"><link rel="prefetch" href="/assets/js/45.dffb4e08.js"><link rel="prefetch" href="/assets/js/46.f58049a5.js"><link rel="prefetch" href="/assets/js/47.6854070c.js"><link rel="prefetch" href="/assets/js/48.6cd9fa3d.js"><link rel="prefetch" href="/assets/js/49.e8861afa.js"><link rel="prefetch" href="/assets/js/5.5c31d62f.js"><link rel="prefetch" href="/assets/js/50.703bffab.js"><link rel="prefetch" href="/assets/js/51.6655c373.js"><link rel="prefetch" href="/assets/js/52.deb2eb09.js"><link rel="prefetch" href="/assets/js/53.6e0ed77d.js"><link rel="prefetch" href="/assets/js/54.b05c58ad.js"><link rel="prefetch" href="/assets/js/55.49c8164e.js"><link rel="prefetch" href="/assets/js/56.a5574e6b.js"><link rel="prefetch" href="/assets/js/57.58cb0de4.js"><link rel="prefetch" href="/assets/js/58.52345112.js"><link rel="prefetch" href="/assets/js/59.663ce78d.js"><link rel="prefetch" href="/assets/js/6.a9df34ee.js"><link rel="prefetch" href="/assets/js/60.f06adde2.js"><link rel="prefetch" href="/assets/js/61.170255a1.js"><link rel="prefetch" href="/assets/js/62.9d120050.js"><link rel="prefetch" href="/assets/js/63.70cced6b.js"><link rel="prefetch" href="/assets/js/64.577f3548.js"><link rel="prefetch" href="/assets/js/65.c037b29d.js"><link rel="prefetch" href="/assets/js/66.7dd1045f.js"><link rel="prefetch" href="/assets/js/67.d3aa4d6c.js"><link rel="prefetch" href="/assets/js/68.526dbb61.js"><link rel="prefetch" href="/assets/js/69.58269266.js"><link rel="prefetch" href="/assets/js/7.6609d4d6.js"><link rel="prefetch" href="/assets/js/70.64108f1b.js"><link rel="prefetch" href="/assets/js/71.1e95e0a6.js"><link rel="prefetch" href="/assets/js/72.42e7ec94.js"><link rel="prefetch" href="/assets/js/73.dad4e1c5.js"><link rel="prefetch" href="/assets/js/74.28ea286a.js"><link rel="prefetch" href="/assets/js/75.dd6d4c6f.js"><link rel="prefetch" href="/assets/js/76.ca6539df.js"><link rel="prefetch" href="/assets/js/77.feb13b0e.js"><link rel="prefetch" href="/assets/js/78.321e90e6.js"><link rel="prefetch" href="/assets/js/79.68eb8fcf.js"><link rel="prefetch" href="/assets/js/8.396d51fd.js"><link rel="prefetch" href="/assets/js/80.4edb5321.js"><link rel="prefetch" href="/assets/js/81.735d7e57.js"><link rel="prefetch" href="/assets/js/82.fa120bdf.js"><link rel="prefetch" href="/assets/js/83.bf755f94.js"><link rel="prefetch" href="/assets/js/84.9b32070c.js"><link rel="prefetch" href="/assets/js/85.592aca7c.js"><link rel="prefetch" href="/assets/js/86.4dcd9e73.js"><link rel="prefetch" href="/assets/js/87.a9e546aa.js"><link rel="prefetch" href="/assets/js/88.2a423212.js"><link rel="prefetch" href="/assets/js/89.5f455115.js"><link rel="prefetch" href="/assets/js/9.adb074c6.js"><link rel="prefetch" href="/assets/js/90.5202da0a.js"><link rel="prefetch" href="/assets/js/91.02cee99d.js"><link rel="prefetch" href="/assets/js/92.f16bad0b.js"><link rel="prefetch" href="/assets/js/93.f933634f.js"><link rel="prefetch" href="/assets/js/94.8e7b1d65.js"><link rel="prefetch" href="/assets/js/95.ee0e4a0a.js"><link rel="prefetch" href="/assets/js/96.e21d78c2.js"><link rel="prefetch" href="/assets/js/97.c87e514e.js"><link rel="prefetch" href="/assets/js/98.d123ac92.js"><link rel="prefetch" href="/assets/js/99.92d1b416.js">
    <link rel="stylesheet" href="/assets/css/0.styles.91f57736.css">
  </head>
  <body>
    <div id="app" data-server-rendered="true"><div class="theme-container no-sidebar" data-v-3ba18f14><div data-v-3ba18f14><div id="loader-wrapper" class="loading-wrapper" data-v-041fef5b data-v-3ba18f14 data-v-3ba18f14><div class="loader-main" data-v-041fef5b><div data-v-041fef5b></div><div data-v-041fef5b></div><div data-v-041fef5b></div><div data-v-041fef5b></div></div> <!----> <!----></div> <div class="password-shadow password-wrapper-out" style="display:none;" data-v-68139a52 data-v-3ba18f14 data-v-3ba18f14><h3 class="title" style="display:none;" data-v-68139a52 data-v-68139a52>JavaKeeper</h3> <!----> <label id="box" class="inputBox" style="display:none;" data-v-68139a52 data-v-68139a52><input type="password" value="" data-v-68139a52> <span data-v-68139a52>Konck! Knock!</span> <button data-v-68139a52>OK</button></label> <div class="footer" style="display:none;" data-v-68139a52 data-v-68139a52><span data-v-68139a52><i class="iconfont reco-theme" data-v-68139a52></i> <a target="blank" href="https://vuepress-theme-reco.recoluan.com" data-v-68139a52>vuePress-theme-reco</a></span> <span data-v-68139a52><i class="iconfont reco-copyright" data-v-68139a52></i> <a data-v-68139a52><span data-v-68139a52>海星</span>
            
          <!---->
          2020
        </a></span></div></div> <div class="hide" data-v-3ba18f14><header class="navbar" data-v-3ba18f14><div class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/" class="home-link router-link-active"><!----> <span class="site-name">JavaKeeper</span></a> <div class="links"><div class="color-picker"><a class="color-button"><i class="iconfont reco-color"></i></a> <div class="color-picker-menu" style="display:none;"><div class="mode-options"><h4 class="title">Choose mode</h4> <ul class="color-mode-options"><li class="dark">dark</li><li class="auto active">auto</li><li class="light">light</li></ul></div></div></div> <div class="search-box"><i class="iconfont reco-search"></i> <input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <nav class="nav-links can-hide"><div class="nav-item"><a href="/java/" class="nav-link"><i class="iconfont undefined"></i>
  Java
</a></div><div class="nav-item"><a href="/data-structure-algorithms/" class="nav-link"><i class="iconfont undefined"></i>
  数据结构与算法
</a></div><div class="nav-item"><a href="/data-store/" class="nav-link"><i class="iconfont undefined"></i>
  数据存储与缓存
</a></div><div class="nav-item"><a href="/interview/" class="nav-link"><i class="iconfont undefined"></i>
  直击面试
</a></div> <a href="https://github.com/Jstarfish/JavaKeeper" target="_blank" rel="noopener noreferrer" class="repo-link"><i class="iconfont reco-github"></i>
    GitHub
    <svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg></a></nav></div></header> <div class="sidebar-mask" data-v-3ba18f14></div> <aside class="sidebar" data-v-3ba18f14><div class="personal-info-wrapper" data-v-5f6acefd data-v-3ba18f14><!----> <h3 class="name" data-v-5f6acefd>
    海星
  </h3> <div class="num" data-v-5f6acefd><div data-v-5f6acefd><h3 data-v-5f6acefd>0</h3> <h6 data-v-5f6acefd>Article</h6></div> <div data-v-5f6acefd><h3 data-v-5f6acefd>0</h3> <h6 data-v-5f6acefd>Tag</h6></div></div> <hr data-v-5f6acefd></div> <nav class="nav-links"><div class="nav-item"><a href="/java/" class="nav-link"><i class="iconfont undefined"></i>
  Java
</a></div><div class="nav-item"><a href="/data-structure-algorithms/" class="nav-link"><i class="iconfont undefined"></i>
  数据结构与算法
</a></div><div class="nav-item"><a href="/data-store/" class="nav-link"><i class="iconfont undefined"></i>
  数据存储与缓存
</a></div><div class="nav-item"><a href="/interview/" class="nav-link"><i class="iconfont undefined"></i>
  直击面试
</a></div> <a href="https://github.com/Jstarfish/JavaKeeper" target="_blank" rel="noopener noreferrer" class="repo-link"><i class="iconfont reco-github"></i>
    GitHub
    <svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg></a></nav> <!----> </aside> <div class="password-shadow password-wrapper-in" style="display:none;" data-v-68139a52 data-v-3ba18f14><h3 class="title" style="display:none;" data-v-68139a52 data-v-68139a52></h3> <!----> <label id="box" class="inputBox" style="display:none;" data-v-68139a52 data-v-68139a52><input type="password" value="" data-v-68139a52> <span data-v-68139a52>Konck! Knock!</span> <button data-v-68139a52>OK</button></label> <div class="footer" style="display:none;" data-v-68139a52 data-v-68139a52><span data-v-68139a52><i class="iconfont reco-theme" data-v-68139a52></i> <a target="blank" href="https://vuepress-theme-reco.recoluan.com" data-v-68139a52>vuePress-theme-reco</a></span> <span data-v-68139a52><i class="iconfont reco-copyright" data-v-68139a52></i> <a data-v-68139a52><span data-v-68139a52>海星</span>
            
          <!---->
          2020
        </a></span></div></div> <div data-v-3ba18f14><main class="page"><div class="page-title" style="display:none;"><h1 class="title">Git 使用规范</h1> <div data-v-5d8dbdb4><i class="iconfont reco-account" data-v-5d8dbdb4><span data-v-5d8dbdb4>海星</span></i> <!----> <!----> <!----></div></div> <div class="theme-reco-content content__default" style="display:none;"><h1 id="git-使用规范"><a href="#git-使用规范" class="header-anchor">#</a> Git 使用规范</h1> <p>团队开发中，遵循一个合理、清晰的 Git 使用流程，是非常重要的。</p> <p>否则，各种不清晰的分支结构，后续产品迭代或维护都会让人很头疼，再如果每个程序员都提交一堆杂乱无章的commit，后续的快速查找定位问题只能通过阅读代码，也是很低效的。</p> <h2 id="分支规范"><a href="#分支规范" class="header-anchor">#</a> 分支规范</h2> <p>几乎所有的版本控制系统都以某种形式支持分支。 使用分支意味着你可以把你的工作从开发主线上分离开来，以免影响开发主线。有人把 Git 的分支模型称为它的“必杀技特性”，因为基于指针的实现使其足够轻量。</p> <p>Git 鼓励在工作流程中频繁地使用分支与合并，哪怕一天之内进行许多次，但仍要遵循一定的规范</p> <h3 id="分支命名"><a href="#分支命名" class="header-anchor">#</a> 分支命名</h3> <ul><li><p><strong>master 分支</strong></p> <ul><li>master 为主分支，也是用于部署生产环境的分支，master 分支要确保稳定性</li> <li>master 分支一般由 develop 以及 hotfix 分支合并，任何时间都不能直接修改代码</li></ul></li> <li><p><strong>develop 分支</strong></p> <ul><li>develop 为开发分支，始终保持最新完成以及bug修复后的代码</li> <li>一般开发新功能时，feature 分支都是基于 develop 分支下创建的</li></ul></li> <li><p><strong>feature 分支</strong></p> <ul><li>开发新功能时，以 develop 分支为基础创建 feature 分支</li> <li>分支命名: feature/ 开头的为特性分支， 命名规则: feature/user_module、 feature/cart_module</li></ul></li> <li><p><strong>release 分支</strong></p> <ul><li>release 为预上线分支，发布提测阶段，以 release 分支代码为基准提测</li></ul></li> <li><p><strong>hotfix 分支</strong></p> <ul><li>分支命名: hotfix/ 开头的为修复分支，它的命名规则与 feature 分支类似</li> <li>线上出现紧急问题时，需要及时修复，以 master 分支为基线，创建 hotfix 分支，修复完成后，需要合并到 master 分支和 develop 分支</li></ul></li></ul> <p>当有一组 feature 开发完成，首先会合并到 develop 分支，进入提测时，会创建 release 分支。
如果测试过程中存在 bug 需要修复，则直接由开发者在 release 分支修复并提交。
当测试完成之后，合并 release 分支到 master 和 develop 分支，此时 master 为最新代码，用作上线。</p> <p><img src="https://tva1.sinaimg.cn/large/00831rSTly1gdmpcpl9i4j30u014ek1b.jpg" alt="img"></p> <p>以上规范不一定是必须的，一般是根据实际情况来的，总结下自己工作中的一些问题</p> <ul><li>自己的分支一定要自测，切记不要提交后，影响到其他代码，更别说别人拉下代码还报错这种低级错误</li> <li>本地分支要做到勤提交，分小功能提交，一次提交一大堆各种功能的做法也要杜绝</li> <li>每天第一件事就是更新 develop 分支内容到本地分支，避免大规模 merge，太容易出错了</li> <li>迭代新版本时，一定要保证当前开发分支和线上分支一样</li></ul> <hr> <h2 id="提交规范"><a href="#提交规范" class="header-anchor">#</a> 提交规范</h2> <p>我们都知道，Git 每次提交代码，都要写 Commit message（提交说明），否则就不允许提交，这其实就是规范，但输入的说明我们可以随便写，之前我也会随便写，被 XX 之后就，，，</p> <div class="language- extra-class"><pre class="language-text"><code>$ git commit -m &quot;hello world&quot;
</code></pre></div><p>上面代码的 -m 参数，就是用来指定 commit message 的。</p> <p>如果一行不够，可以只执行git commit，就会跳出文本编辑器，让你写多行。</p> <p>一般来说，commit message 应该清晰明了，说明本次提交的目的。而且多人协作的时候，有问题也方便查看提交日志。</p> <p><strong>目前，社区有多种 Commit message 的写法规范。来自Angular 规范是目前使用最广的写法，比较合理和系统化。如下图：</strong></p> <p><img src="https://tva1.sinaimg.cn/large/00831rSTly1gdmpkgqwrjj31a80u0n60.jpg" alt=""></p> <p>每次提交，Commit message 都包括三个部分：Header，Body 和 Footer。</p> <div class="language- extra-class"><pre class="language-text"><code>&lt;type&gt;(&lt;scope&gt;): &lt;subject&gt;
// 空一行
&lt;body&gt;
// 空一行
&lt;footer&gt;
</code></pre></div><p>其中，Header 是必需的，Body 和 Footer 可以省略。</p> <p>不管是哪一个部分，任何一行都不要有太多字符。这是为了避免自动换行影响美观。</p> <h3 id="head"><a href="#head" class="header-anchor">#</a> Head</h3> <p>Header部分只有一行，包括三个字段：<code>type</code>（必填）、<code>scope</code>（影响范围，选填）和<code>subject</code>（必填）。</p> <h4 id="type"><a href="#type" class="header-anchor">#</a> type</h4> <p><code>type</code> 用于说明 commit 的类别，只允许使用下面7个标识（或者用对应的 emoji 表情，在前边再加一个<code>:</code> 就会显示了）。</p> <ul><li><strong>feat</strong>：新功能（✨）</li> <li><strong>fix</strong>：修补bug（ 🚑）</li> <li><strong>docs</strong>：修改文档（📚）</li> <li><strong>style</strong>： 格式化代码结构，没有逻辑上的代码修改（🎨)</li> <li><strong>refactor</strong>：重构，即不是新增功能，也不是修改bug的代码变动，比如重命名变量（🚜）</li> <li><strong>test</strong>：增加测试代码，单元测试一类的，没有生产代码的变更（🔬）</li> <li><strong>chore</strong>：构建过程或辅助工具的变动（不会影响代码运行）</li></ul> <h4 id="scope"><a href="#scope" class="header-anchor">#</a> scope</h4> <p><code>scope</code> 用于定义 <code>type</code> 影响的范围，比如数据层、控制层、视图层等等，视项目不同而不同。</p> <h4 id="subject"><a href="#subject" class="header-anchor">#</a> subject</h4> <p><code>subject</code>是 commit 目的的简短描述，不超过50个字符。</p> <h3 id="body"><a href="#body" class="header-anchor">#</a> Body</h3> <p>Body 部分是对本次 commit 的详细描述，可以分成多行，每行尽量不超过72个字符。</p> <h3 id="footer"><a href="#footer" class="header-anchor">#</a> Footer</h3> <p>Footer 部分只用于两种情况</p> <ul><li><p><strong>不兼容变动</strong>：如果当前代码与上一个版本不兼容，则 Footer 部分以<code>BREAKING CHANGE</code>开头，后面是对变动的描述、以及变动理由和迁移方法。</p></li> <li><p><strong>关闭 Issue</strong>：如果当前 commit 针对某个issue，那么可以在 Footer 部分关闭这个 issue 。</p> <div class="language- extra-class"><pre class="language-text"><code>Closes #234
Closes #123, #245, #992
</code></pre></div></li></ul> <h3 id="revert"><a href="#revert" class="header-anchor">#</a> Revert</h3> <p>还有一种特殊情况，如果当前 commit 用于撤销以前的 commit，则必须以<code>revert:</code>开头，后面跟着被撤销 Commit 的 Header。</p> <div class="language- extra-class"><pre class="language-text"><code>revert: feat(pencil): add 'graphiteWidth' option
This reverts commit 667ecc1654a317a13331b17617d973392f415f02.
</code></pre></div><p>再推荐一个编写 Commit message 的工具，<strong>Commitizen</strong>：https://github.com/commitizen/cz-cli</p> <blockquote><p>这么多规范有什么用吗，如果项目中只有两三个人开发，其实也不需要严格的规范，只要把提交内容写清楚就行，但是大型项目，开发人员较多，规范提交还是有必要的</p></blockquote> <h4 id="格式化的commit-message-有几个好处"><a href="#格式化的commit-message-有几个好处" class="header-anchor">#</a> 格式化的Commit message，有几个好处</h4> <ul><li><p>提供更多的历史信息，方便快速浏览</p> <p>比如，下面的命令显示上次发布后的变动，每个 commit 占据一行。你只看行首，就知道某次 commit 的目的。</p> <div class="language- extra-class"><pre class="language-text"><code>$ git log &lt;last tag&gt; HEAD --pretty=format:%s
</code></pre></div></li> <li><p>可以过滤某些commit（比如文档改动），便于快速查找信息</p> <p>比如，下面的命令仅仅显示本次发布新增加的功能</p> <div class="language- extra-class"><pre class="language-text"><code>$ git log &lt;last release&gt; HEAD --grep feature
</code></pre></div></li> <li><p>可以直接从 commit 生成 Change log（Change Log 是发布新版本时，用来说明与上一个版本差异的文档）</p></li></ul> <p>最后列出一些 git 提交支持的 emoji 表情，就算是看GitHub 或 GitLab，也很有意思，也是目前我们项目使用的方式。</p> <p><img src="https://tva1.sinaimg.cn/large/00831rSTly1gdnd7ekhb7j31iw0roahl.jpg" alt=""></p> <table><thead><tr><th>Emoji</th> <th>Raw Emoji Code</th> <th>Description</th></tr></thead> <tbody><tr><td>🎨</td> <td><code>:art:</code></td> <td>when improving the <strong>format</strong>/structure of the code</td></tr> <tr><td>📰</td> <td><code>:newspaper:</code></td> <td>when creating a <strong>new file</strong></td></tr> <tr><td>📝</td> <td><code>:pencil:</code></td> <td>when <strong>performing minor changes/fixing</strong> the code or language</td></tr> <tr><td>🐎</td> <td><code>:racehorse:</code></td> <td>when improving <strong>performance</strong></td></tr> <tr><td>📚</td> <td><code>:books:</code></td> <td>when writing <strong>docs</strong></td></tr> <tr><td>🐛</td> <td><code>:bug:</code></td> <td>when reporting a <strong>bug</strong>, with <a href="https://github.com/slashsbin/styleguide-todo-grammar#bug-report" target="_blank" rel="noopener noreferrer"><code>@FIXME</code><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg></a>Comment Tag</td></tr> <tr><td>🚑</td> <td><code>:ambulance:</code></td> <td>when fixing a <strong>bug</strong></td></tr> <tr><td>🐧</td> <td><code>:penguin:</code></td> <td>when fixing something on <strong>Linux</strong></td></tr> <tr><td>🍎</td> <td><code>:apple:</code></td> <td>when fixing something on <strong>Mac OS</strong></td></tr> <tr><td>🏁</td> <td><code>:checkered_flag:</code></td> <td>when fixing something on <strong>Windows</strong></td></tr> <tr><td>🔥</td> <td><code>:fire:</code></td> <td>when <strong>removing code</strong> or files, <em>maybe</em> with <code>@CHANGED</code> Comment Tag</td></tr> <tr><td>🚜</td> <td><code>:tractor:</code></td> <td>when <strong>change file structure</strong>. Usually together with 🎨</td></tr> <tr><td>🔨</td> <td><code>:hammer:</code></td> <td>when <strong>refactoring</strong> code</td></tr> <tr><td>☔️</td> <td><code>:umbrella:</code></td> <td>when adding <strong>tests</strong></td></tr> <tr><td>🔬</td> <td><code>:microscope:</code></td> <td>when adding <strong>code coverage</strong></td></tr> <tr><td>💚</td> <td><code>:green_heart:</code></td> <td>when fixing the <strong>CI</strong> build</td></tr> <tr><td>🔒</td> <td><code>:lock:</code></td> <td>when dealing with <strong>security</strong></td></tr> <tr><td>⬆️</td> <td><code>:arrow_up:</code></td> <td>when upgrading <strong>dependencies</strong></td></tr> <tr><td>⬇️</td> <td><code>:arrow_down:</code></td> <td>when downgrading <strong>dependencies</strong></td></tr> <tr><td>⏩</td> <td><code>:fast_forward:</code></td> <td>when <strong>forward-porting features</strong> from an older version/branch</td></tr> <tr><td>⏪</td> <td><code>:rewind:</code></td> <td>when <strong>backporting features</strong> from a newer version/branch</td></tr> <tr><td>👕</td> <td><code>:shirt:</code></td> <td>when removing <strong>linter</strong>/strict/deprecation warnings</td></tr> <tr><td>💄</td> <td><code>:lipstick:</code></td> <td>when improving <strong>UI</strong>/Cosmetic</td></tr> <tr><td>♿️</td> <td><code>:wheelchair:</code></td> <td>when improving <strong>accessibility</strong></td></tr> <tr><td>🌐</td> <td><code>:globe_with_meridians:</code></td> <td>when dealing with <strong>globalization</strong>/internationalization/i18n/g11n</td></tr> <tr><td>🚧</td> <td><code>:construction:</code></td> <td><strong>WIP</strong>(Work In Progress) Commits, <em>maybe</em> with <code>@REVIEW</code> Comment Tag</td></tr> <tr><td>💎</td> <td><code>:gem:</code></td> <td>New <strong>Release</strong></td></tr> <tr><td>🥚</td> <td><code>:egg:</code></td> <td>New <strong>Release</strong> with Python egg</td></tr> <tr><td>🎡</td> <td><code>:ferris_wheel:</code></td> <td>New <strong>Release</strong> with Python wheel package</td></tr> <tr><td>🔖</td> <td><code>:bookmark:</code></td> <td>Version <strong>Tags</strong></td></tr> <tr><td>🎉</td> <td><code>:tada:</code></td> <td><strong>Initial</strong> Commit</td></tr> <tr><td>🔈</td> <td><code>:speaker:</code></td> <td>when Adding <strong>Logging</strong></td></tr> <tr><td>🔇</td> <td><code>:mute:</code></td> <td>when Reducing <strong>Logging</strong></td></tr> <tr><td>✨</td> <td><code>:sparkles:</code></td> <td>when introducing <strong>New</strong> Features</td></tr> <tr><td>⚡️</td> <td><code>:zap:</code></td> <td>when introducing <strong>Backward-InCompatible</strong> Features, <em>maybe</em> with <code>@CHANGED</code> Comment Tag</td></tr> <tr><td>💡</td> <td><code>:bulb:</code></td> <td>New <strong>Idea</strong>, with <code>@IDEA</code> Comment Tag</td></tr> <tr><td>❄️</td> <td><code>:snowflake:</code></td> <td>changing <strong>Configuration</strong>, Usually together with 🐧 or 🎀 or 🚀</td></tr> <tr><td>🎀</td> <td><code>:ribbon:</code></td> <td>Customer requested application <strong>Customization</strong>, with <code>@HACK</code> Comment Tag</td></tr> <tr><td>🚀</td> <td><code>:rocket:</code></td> <td>Anything related to Deployments/<strong>DevOps</strong></td></tr> <tr><td>🐘</td> <td><code>:elephant:</code></td> <td><strong>PostgreSQL</strong> Database specific (Migrations, Scripts, Extensions, ...)</td></tr> <tr><td>🐬</td> <td><code>:dolphin:</code></td> <td><strong>MySQL</strong> Database specific (Migrations, Scripts, Extensions, ...)</td></tr> <tr><td>🍃</td> <td><code>:leaves:</code></td> <td><strong>MongoDB</strong> Database specific (Migrations, Scripts, Extensions, ...)</td></tr> <tr><td>🏦</td> <td><code>:bank:</code></td> <td><strong>Generic Database</strong> specific (Migrations, Scripts, Extensions, ...)</td></tr> <tr><td>🐳</td> <td><code>:whale:</code></td> <td><strong>Docker</strong> Configuration</td></tr> <tr><td>🤝</td> <td><code>:handshake:</code></td> <td>when <strong>Merge files</strong></td></tr> <tr><td>🍒</td> <td><code>:cherries:</code></td> <td>when Commit Arise from one or more <a href="https://git-scm.com/docs/git-cherry-pick" target="_blank" rel="noopener noreferrer"><strong>Cherry-Pick</strong><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg></a> Commit(s)</td></tr></tbody></table> <h2 id="参考"><a href="#参考" class="header-anchor">#</a> 参考</h2> <p>https://github.com/slashsBin/styleguide-git-commit-message</p> <p>http://www.ruanyifeng.com/blog/2016/01/commit_message_change_log.html</p></div> <footer class="page-edit" style="display:none;"><!----> <!----></footer> <!----> <!----> <!----></main> <!----></div></div></div></div><div class="global-ui"><div class="back-to-ceiling" style="right:1rem;bottom:6rem;width:2.5rem;height:2.5rem;border-radius:.25rem;line-height:2.5rem;display:none;" data-v-db14854a data-v-db14854a><svg t="1574745035067" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5404" class="icon" data-v-db14854a><path d="M526.60727968 10.90185116a27.675 27.675 0 0 0-29.21455937 0c-131.36607665 82.28402758-218.69155461 228.01873535-218.69155402 394.07834331a462.20625001 462.20625001 0 0 0 5.36959153 69.94390903c1.00431239 6.55289093-0.34802892 13.13561351-3.76865779 18.80351572-32.63518765 54.11355614-51.75690182 118.55860487-51.7569018 187.94566865a371.06718723 371.06718723 0 0 0 11.50484808 91.98906777c6.53300375 25.50556257 41.68394495 28.14064038 52.69160883 4.22606766 17.37162448-37.73630017 42.14135425-72.50938081 72.80769204-103.21549295 2.18761121 3.04276886 4.15646224 6.24463696 6.40373557 9.22774369a1871.4375 1871.4375 0 0 0 140.04691725 5.34970492 1866.36093723 1866.36093723 0 0 0 140.04691723-5.34970492c2.24727335-2.98310674 4.21612437-6.18497483 6.3937923-9.2178004 30.66633723 30.70611158 55.4360664 65.4791928 72.80769147 103.21549355 11.00766384 23.91457269 46.15860503 21.27949489 52.69160879-4.22606768a371.15156223 371.15156223 0 0 0 11.514792-91.99901164c0-69.36717486-19.13165746-133.82216804-51.75690182-187.92578088-3.42062944-5.66790279-4.76302748-12.26056868-3.76865837-18.80351632a462.20625001 462.20625001 0 0 0 5.36959269-69.943909c-0.00994388-166.08943902-87.32547796-311.81420293-218.6915546-394.09823051zM605.93803103 357.87693858a93.93749974 93.93749974 0 1 1-187.89594924 6.1e-7 93.93749974 93.93749974 0 0 1 187.89594924-6.1e-7z" p-id="5405" data-v-db14854a></path><path d="M429.50777625 765.63860547C429.50777625 803.39355007 466.44236686 1000.39046097 512.00932183 1000.39046097c45.56695499 0 82.4922232-197.00623328 82.5015456-234.7518555 0-37.75494459-36.9345906-68.35043303-82.4922232-68.34111062-45.57627738-0.00932239-82.52019037 30.59548842-82.51086798 68.34111062z" p-id="5406" data-v-db14854a></path></svg></div><!----></div></div>
    <script src="/assets/js/app.447d4224.js" defer></script><script src="/assets/js/3.9d76740c.js" defer></script><script src="/assets/js/1.c4fd7d2e.js" defer></script><script src="/assets/js/188.8dfc358f.js" defer></script>
  </body>
</html>
